Skip to content

HYPBLD-847: Add acm-2.16 branch content: group.yml, streams.yml, images/*.yml#10635

Merged
ashwindasr merged 12 commits into
openshift-eng:acm-2.16from
smithbw88:acm-2.16
May 21, 2026
Merged

HYPBLD-847: Add acm-2.16 branch content: group.yml, streams.yml, images/*.yml#10635
ashwindasr merged 12 commits into
openshift-eng:acm-2.16from
smithbw88:acm-2.16

Conversation

@smithbw88
Copy link
Copy Markdown

@smithbw88 smithbw88 commented May 16, 2026 •
edited by openshift-ci Bot
Loading

HYPBLD-847: Create ocp-build-data configuration for ACM 2.16.

  • group.yml: product identity (acm), OCP 4.21 alignment, Go 1.25, 4 architectures, RHEL 9.6 E4S repos, OCP_TARGET_VERSIONS 4.18-4.22
  • streams.yml: rhel-9-golang, rhel-8-golang, rhel-9-nodejs-20, ose-cli, rhel9 (ubi-minimal) base image definitions
  • images/.yml: 46 ACM component configurations with stolostron source URLs, acm--container distgit naming, rhacm2/*-rhel9 delivery repos
  • DECISIONS.md: rationale for all product decisions

Signed-off-by: Brian Smith briansmi@redhat.com

@smithbw88 @cursoragent
Add acm-2.16 branch content: group.yml, streams.yml, images/*.yml
36bcf6a 
HYPBLD-847: Create ocp-build-data configuration for ACM 2.16.

- group.yml: product identity (acm), OCP 4.21 alignment, Go 1.25,
  4 architectures, RHEL 9.6 E4S repos, OCP_TARGET_VERSIONS 4.18-4.22
- streams.yml: rhel-9-golang, rhel-8-golang, rhel-9-nodejs-20,
  ose-cli, rhel9 (ubi-minimal) base image definitions
- images/*.yml: 46 ACM component configurations with stolostron
  source URLs, acm-*-container distgit naming, rhacm2/*-rhel9
  delivery repos
- DECISIONS.md: rationale for all product decisions

Co-authored-by: Cursor <cursoragent@cursor.com>
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented May 16, 2026

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented May 16, 2026

Hi @smithbw88. Thanks for your PR.

I'm waiting for a openshift-eng member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work.

Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@openshift-ci openshift-ci Bot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label May 16, 2026
@smithbw88 smithbw88 changed the title Add acm-2.16 branch content: group.yml, streams.yml, images/*.yml HYPBLD-847: Add acm-2.16 branch content: group.yml, streams.yml, images/*.yml May 16, 2026
@openshift-ci-robot
Copy link
Copy Markdown

openshift-ci-robot commented May 16, 2026 •
edited by openshift-ci Bot
Loading

@smithbw88: This pull request references HYPBLD-847 which is a valid jira issue.

Details

In response to this:

HYPBLD-847: Create ocp-build-data configuration for ACM 2.16.

  • group.yml: product identity (acm), OCP 4.21 alignment, Go 1.25, 4 architectures, RHEL 9.6 E4S repos, OCP_TARGET_VERSIONS 4.18-4.22
  • streams.yml: rhel-9-golang, rhel-8-golang, rhel-9-nodejs-20, ose-cli, rhel9 (ubi-minimal) base image definitions
  • images/.yml: 46 ACM component configurations with stolostron source URLs, acm--container distgit naming, rhacm2/*-rhel9 delivery repos
  • DECISIONS.md: rationale for all product decisions

Signed-off-by: Brian Smith briansmi@redhat.com

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label May 16, 2026
ashwindasr
ashwindasr reviewed May 16, 2026
View reviewed changes
Comment thread group.yml Outdated
ashwindasr
ashwindasr reviewed May 16, 2026
View reviewed changes
Comment thread group.yml Outdated
ashwindasr
ashwindasr reviewed May 16, 2026
View reviewed changes
Comment thread group.yml Outdated
ashwindasr
ashwindasr requested changes May 16, 2026
View reviewed changes
Comment thread group.yml Outdated
@ashwindasr
Copy link
Copy Markdown
Contributor

ashwindasr commented May 16, 2026

/hold

Until its confirmed that repos exist in the openshift-priv org and test builds pass

@openshift-ci openshift-ci Bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 16, 2026
smithbw88 and others added 2 commits May 18, 2026 08:41
@smithbw88 @cursoragent
Set network_mode to hermetic in group.yml
f508d06 
Per reviewer suggestion: group should be hermetic, with manual override
for non-hermetic builds as needed.

Co-authored-by: Cursor <cursoragent@cursor.com>
@ashwindasr
update midstream repo name
ab46e05 
rh-pre-commit.version: 2.3.2
rh-pre-commit.check-secrets: ENABLED
@ashwindasr
Copy link
Copy Markdown
Contributor

ashwindasr commented May 18, 2026 •
edited
Loading

Midstream repo names follow this naming convention: ab46e05

Verified that repos exist in priv

ashwindasr
ashwindasr requested changes May 18, 2026
View reviewed changes
Comment thread images/acm-cli.yml Outdated
@ashwindasr
Copy link
Copy Markdown
Contributor

ashwindasr commented May 18, 2026

/ok-to-test

@openshift-ci openshift-ci Bot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels May 18, 2026
smithbw88 and others added 3 commits May 18, 2026 11:19
@smithbw88 @cursoragent
Fix dockerfile paths to reference actual existing Dockerfiles
3ac41fa 
Replace Dockerfile.art references (which don't exist in the repos yet)
with the actual Dockerfiles used by each component on release-2.16:
Dockerfile.rhtap, Containerfile.operator, Containerfile.acm.konflux, etc.

Co-authored-by: Cursor <cursoragent@cursor.com>
@smithbw88 @cursoragent
Add cachito gomod paths for components with git submodules
a2b1c8a 
Components with git submodules need explicit cachito.packages.gomod
paths so hermetic builds can prefetch dependencies from all go.mod
files, not just the root. Without this, builds fail because submodule
directories don't exist at build time.

Affected components and their submodule gomod paths:
- acm-cli: external/policy-cli, policy-generator-plugin, allowlist-migration-mcoa
- memcached-exporter: promu/
- multicluster-operators-subscription: external/policy-generator-plugin, external/helm
- must-gather: external/hypershift
- node-exporter: promu/
- observatorium-operator: locutus
- prometheus: promu/
- prometheus-alertmanager: promu/
- thanos: promu/

Co-authored-by: Cursor <cursoragent@cursor.com>
@smithbw88 @cursoragent
Add Dockerfile modification to skip submodule update for acm-cli
42c4d3c 
ART's rebase clones the submodule repos directly into external/,
so git submodule update --init is unnecessary and fails in hermetic
builds. Replace make sync-build-package with make build-and-package
to skip the sync-repos target while keeping the build flow intact.

Co-authored-by: Cursor <cursoragent@cursor.com>
This was referenced May 20, 2026
Closed
Open
@smithbw88 @cursoragent
Fix cert-policy-controller and must-gather build failures, add build_…
5427b19 
…attempts

- cert-policy-controller: Add enabled_repos for baseos and appstream
  so microdnf can install procps and shadow-utils
- must-gather: Add Dockerfile modification to replace --chown=default
  with --chown=1001:0 since the ART golang builder image doesn't have
  the "default" user that ubi9/go-toolset provides
- group.yml: Add build_attempts: 1 under konflux to limit retries
  during initial build debugging

Co-authored-by: Cursor <cursoragent@cursor.com>
smithbw88 and others added 2 commits May 21, 2026 16:00
@smithbw88 @cursoragent
Add enabled_repos to must-gather for RPM installation
8ff37bf 
must-gather needs baseos and appstream repos to install jq, tar,
gzip, rsync, and findutils via microdnf.

Co-authored-by: Cursor <cursoragent@cursor.com>
@smithbw88 @cursoragent
Temporarily disable console, grafana, and multicluster-operators-subs…
1a6809b 
…cription

These three components have build failures that require ART/ACM
input to resolve. Disabling them to unblock the PR merge while
debugging continues separately.

Co-authored-by: Cursor <cursoragent@cursor.com>
@ashwindasr
Copy link
Copy Markdown
Contributor

ashwindasr commented May 21, 2026

/unhold

@openshift-ci openshift-ci Bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 21, 2026
@ashwindasr ashwindasr merged commit 918d9e6 into openshift-eng:acm-2.16 May 21, 2026
1 check was pending
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ashwindasr ashwindasr ashwindasr requested changes

Assignees

@ashwindasr ashwindasr

Labels

jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. ok-to-test Indicates a non-member PR verified by an org member that is safe to test.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@smithbw88 @openshift-ci-robot @ashwindasr